Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Jul 2011 08:58:44 +0000 (01:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Jul 2011 08:58:44 +0000 (01:58 -0700)

Trivial merge